From 27b1d120e8ea780749cbecbbdd0afe4b2b29a4b2 Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Wed, 27 Feb 2002 22:09:03 +0000 Subject: [PATCH] minor code cleanup Wed Feb 27 23:02:55 2002 Soeren Sandmann * gtk/gtkhandlebox.c (gtk_handle_box_realize): minor code cleanup --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkhandlebox.c | 12 ++++++------ 8 files changed, 34 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 499609d296..a7337d7324 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Feb 27 23:02:55 2002 Soeren Sandmann + + * gtk/gtkhandlebox.c (gtk_handle_box_realize): minor code cleanup + Wed Feb 27 14:58:12 2002 Owen Taylor * gtk/gtkmenubar.c (gtk_menu_bar_size_request/allocate): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 499609d296..a7337d7324 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +Wed Feb 27 23:02:55 2002 Soeren Sandmann + + * gtk/gtkhandlebox.c (gtk_handle_box_realize): minor code cleanup + Wed Feb 27 14:58:12 2002 Owen Taylor * gtk/gtkmenubar.c (gtk_menu_bar_size_request/allocate): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 499609d296..a7337d7324 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Wed Feb 27 23:02:55 2002 Soeren Sandmann + + * gtk/gtkhandlebox.c (gtk_handle_box_realize): minor code cleanup + Wed Feb 27 14:58:12 2002 Owen Taylor * gtk/gtkmenubar.c (gtk_menu_bar_size_request/allocate): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 499609d296..a7337d7324 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +Wed Feb 27 23:02:55 2002 Soeren Sandmann + + * gtk/gtkhandlebox.c (gtk_handle_box_realize): minor code cleanup + Wed Feb 27 14:58:12 2002 Owen Taylor * gtk/gtkmenubar.c (gtk_menu_bar_size_request/allocate): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 499609d296..a7337d7324 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Wed Feb 27 23:02:55 2002 Soeren Sandmann + + * gtk/gtkhandlebox.c (gtk_handle_box_realize): minor code cleanup + Wed Feb 27 14:58:12 2002 Owen Taylor * gtk/gtkmenubar.c (gtk_menu_bar_size_request/allocate): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 499609d296..a7337d7324 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Wed Feb 27 23:02:55 2002 Soeren Sandmann + + * gtk/gtkhandlebox.c (gtk_handle_box_realize): minor code cleanup + Wed Feb 27 14:58:12 2002 Owen Taylor * gtk/gtkmenubar.c (gtk_menu_bar_size_request/allocate): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 499609d296..a7337d7324 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Wed Feb 27 23:02:55 2002 Soeren Sandmann + + * gtk/gtkhandlebox.c (gtk_handle_box_realize): minor code cleanup + Wed Feb 27 14:58:12 2002 Owen Taylor * gtk/gtkmenubar.c (gtk_menu_bar_size_request/allocate): diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c index 696e5bd2cd..f31ed83a07 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/gtkhandlebox.c @@ -405,11 +405,11 @@ gtk_handle_box_realize (GtkWidget *widget) attributes.width = widget->allocation.width; attributes.height = widget->allocation.height; attributes.window_type = GDK_WINDOW_CHILD; - attributes.event_mask |= (gtk_widget_get_events (widget) | - GDK_EXPOSURE_MASK | - GDK_BUTTON1_MOTION_MASK | - GDK_POINTER_MOTION_HINT_MASK | - GDK_BUTTON_PRESS_MASK | + attributes.event_mask = (gtk_widget_get_events (widget) | + GDK_EXPOSURE_MASK | + GDK_BUTTON1_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK | + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; hb->bin_window = gdk_window_new (widget->window, &attributes, attributes_mask); @@ -470,7 +470,7 @@ gtk_handle_box_style_set (GtkWidget *widget, !GTK_WIDGET_NO_WINDOW (widget)) { gtk_style_set_background (widget->style, widget->window, -widget->state); + widget->state); gtk_style_set_background (widget->style, hb->bin_window, widget->state); gtk_style_set_background (widget->style, hb->float_window, widget->state); } -- 2.30.2